Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 03:53:56 +0000 (20:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 03:53:56 +0000 (20:53 -0700)

Trivial merge